@@ -112,8 +112,6 @@ group :development do |
||
112 | 112 |
gem 'rspec-rails', '~> 3.1' |
113 | 113 |
gem 'rspec-html-matchers', '~> 0.7' |
114 | 114 |
gem 'shoulda-matchers' |
115 |
- gem 'spring', '~> 1.3.0' |
|
116 |
- gem 'spring-commands-rspec' |
|
117 | 115 |
gem 'vcr' |
118 | 116 |
gem 'webmock', '~> 1.17.4', require: false |
119 | 117 |
end |
@@ -413,9 +413,6 @@ GEM |
||
413 | 413 |
slop (3.6.0) |
414 | 414 |
spectrum-rails (1.3.4) |
415 | 415 |
railties (>= 3.1) |
416 |
- spring (1.3.6) |
|
417 |
- spring-commands-rspec (1.0.4) |
|
418 |
- spring (>= 0.9.1) |
|
419 | 416 |
sprockets (3.2.0) |
420 | 417 |
rack (~> 1.0) |
421 | 418 |
sprockets-rails (2.3.1) |
@@ -562,8 +559,6 @@ DEPENDENCIES |
||
562 | 559 |
shoulda-matchers |
563 | 560 |
slack-notifier (~> 1.0.0) |
564 | 561 |
spectrum-rails |
565 |
- spring (~> 1.3.0) |
|
566 |
- spring-commands-rspec |
|
567 | 562 |
string-scrub |
568 | 563 |
therubyracer (~> 0.12.2) |
569 | 564 |
tumblr_client |
@@ -582,4 +577,4 @@ DEPENDENCIES |
||
582 | 577 |
xmpp4r (~> 0.5.6) |
583 | 578 |
|
584 | 579 |
BUNDLED WITH |
585 |
- 1.10.5 |
|
580 |
+ 1.10.6 |
@@ -8,7 +8,7 @@ guard 'livereload' do |
||
8 | 8 |
watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" } |
9 | 9 |
end |
10 | 10 |
|
11 |
-guard :rspec, cmd: 'bundle exec spring rspec' do |
|
11 |
+guard :rspec, cmd: 'bundle exec rspec' do |
|
12 | 12 |
watch(%r{^spec/.+_spec\.rb$}) |
13 | 13 |
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } |
14 | 14 |
watch('spec/spec_helper.rb') { "spec" } |
@@ -1,15 +0,0 @@ |
||
1 |
-#!/usr/bin/env ruby |
|
2 |
- |
|
3 |
-# This file loads spring without using Bundler, in order to be fast. |
|
4 |
-# It gets overwritten when you run the `spring binstub` command. |
|
5 |
- |
|
6 |
-unless defined?(Spring) |
|
7 |
- require "rubygems" |
|
8 |
- require "bundler" |
|
9 |
- |
|
10 |
- if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m) |
|
11 |
- Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s } |
|
12 |
- gem "spring", match[1] |
|
13 |
- require "spring/binstub" |
|
14 |
- end |
|
15 |
-end |